ADD: Basic support for MXN and CAD