International Shipping - Freight Forwarder & Broker ?!

Standard Epicor has fields for Freight Forwarder but we’re also required to have a Broker for international shipments into Mexcio (and maybe to a few others).

Anyone else ran into this? Is there a way to do it without making UD fields?