added option to settings.xml
added custom provider support