Add utilties for hierarchy
Finalize hierarchy