Fixed workspaces for new protocol