updated to workbench structure