Adapted BirthCity for new changes