[WS] - refactoring country repository.