Refactoring and add countries list