More work on multi currency support