Added support of multi-currencies