Updated Workspace script