Add state tracking to geocodings