Updates to sync up to the Gateway API to support CityTech development