New changes for Water Application (Dynamic routes).