#60 Better implementation of exchange rates