Removed reliance on Workspace