Alter City Model to just put City name by default, and allow customisation of output