Made workbench more modular