Workspace management - first working version