Refactoring for DI and more countries

More common way for:
- using it via dependency injection
- supporting more countries