Changing all data handling to workspaces