Updated the keyService and loggingService
Refactored workspace service