Enhance conversion to support TENDERED_AMOUNT/TENDERED_CURRENCY

Fixes #11