City and Country models updated