Changed relationship between country and city eneity.

Changed relationship between country and city eneity.