Added city relationship and refactored dao impl