improve currency factory