Added entity Point and City, and added CityService