IDEX-1275: improved workspace service