Update city model definition and make compatible with  loader
Merge pull request #5 from TeaWithStrangers/city-fundamentals

Update city model definition and make compatible with  loader