YH-298: Added pseudo-hierarchy to organization types