IDEX-1275: improved WorkspaceService