Added logic to work with Countries