Currency management improvements