Fixed hard dependency on Extended Workbench