Amending Comprehensive Plan and Adopting Water System Plan