New national water policy in the pipeline