Add currency
Fix merge
Fix handler