Gov. Baker wants greater control over state water supply