- full support for paymentType filed, added new type to handle, new localised tokens