added static 'provider' and fixed config selection