added currency conversion support