[TASK] Add namespaing to WorkspaceService