Add hasPart and isPartOf