changes to geopoint and Date