#205: Rework workshop support