When client creates customs surcharge groups – copy those groups into External Mappings. This will prevent from having to do both. We have 2 options to choose from.