Added support for workbench