Refactored services, pending splitting them into WebApiService and AccessManagerService