Merge: Subtype improvements