Refactored MaxMindProvider