More work on AddWorkgroupToPlannedStructure