Added support for multiple currencies