Make workbench spec friendly