Improving Efficiency and Reliability in Water Distribution Systems