Major simplification of the HierarchyBuilder