NEW: Workspace support (WIP)