Added fully functional Water Supplier