Added main Workspace support