Improved workbench import