Refactoring: Unit/City maps changed to hash maps.