Added more flexibility to the hierarchy.