Replacing the workspace creation by the new system.