Chao - Changed data models

Data models changed with repeated properties and geoPoint property types