Add workbench and some changes