Make Service Provider deferred
Revert last commit