Re-engineer for EDXL messaging.