Added SubtypeAwareParentElemApi etc.