Added templated dict to replace std::maps