Added city model and set associations