Completed countries refactoring