Refactored ServiceProvider
Merge branch 'develop'