Added support for non-STR currency amounts