added controller for city, state and country; updated esposed entities