update loadCurrent() to take std::map raw