Now handling Primitive -> Composite / Composite -> Primitive