Updated hierarchy with new inst.id model