To my opinion Order-Address would benefit from adding same fields that are present in Ship-To-Address:

• Vendor No.
• Location code
• Shipment Method Code
• Last Date Modified

Both catalogues would benefit from other intrastat related information that could be predefined on these cards

• Transport method
• Transaction type
• Transaction specification
• Exit point
• Area