Fixed class lineage flatenning