Fixing bugs and supporting no providers list