added support for more currecy formats