Chapter Pumped-Storage and Hybrid Energy Solutions Towards the Improvement of Energy Efficiency in Water Systems