Refactored Services and Added AuthProvider