Workbench inteface improvements