ChainBuilder updated