More people to get pipe water within next two years