Changed primary key in State and City models