Change the implementation of the City class