Refactoring of geoip related functionality to have it less coupled