More work on the ChainBuilder