Added multi-provider setup and some fixes