Updated ServiceProvider wrapper, reported in issue #4