More changes to Workgroup Structure code