Extended Workbench Support