Advancing the Cyberinfrastructure for Smart Water Metering and Water Demand Modeling