Changed mappings to subClassOf.