Improve chain maker and prepare it for execution plan builder use-case.