Cleaned up parametric logic

Simplified the way the workbench is built