Added hasPart and isPartOf