YH-525: Speedup organization hierarchy