Added some changes to city model