Workspace registration improvements