Adjustments on city and crud model