added support for workspaces