Water Savant enhancements