Removed redundant code
Enable configuration of map providers
Nearly working