More code migration to the new currency classes