Upgraded water infrastructure