Properly handle when it returns a ClassHierarchy