Switch to workbench based decoupling