Service component Provider adapter logic patched

Tested with regular adapters only, no service component adapters have been tested yet.