rework to enhance multicurrency support