City model related changes are implemented.