Added support for the Workspaces option