Fixing issue #2 - Refactor in order to replace Country and City with Region.