Refactored GeoPluginProvider