WIP
xdiMessage -> xdiMessageEnvelope