Bill to expand definition of 'village' qualifying for water