Refactor country class get methods Closes #4692