FALCON-369 Refactor workflow builder