Refactor Currency Map