Refactoring Country classes to further generalize extensibility