Modified Schedule so it has SiteId, Removed CityId/Name