Government publishes new plan for water