Added subclasses in disjoint classes and properties