Expanded generator to support generating the bound tree.