diff --git a/src/requesthandler/RequestHandler.cpp b/src/requesthandler/RequestHandler.cpp
index df43364a..ea78ecda 100644
--- a/src/requesthandler/RequestHandler.cpp
+++ b/src/requesthandler/RequestHandler.cpp
@@ -19,7 +19,7 @@ with this program. If not, see
#include "RequestHandler.h"
-const std::map RequestHandler::_handlerMap
+const std::unordered_map RequestHandler::_handlerMap
{
// General
{"GetVersion", &RequestHandler::GetVersion},
diff --git a/src/requesthandler/RequestHandler.h b/src/requesthandler/RequestHandler.h
index e18bb3ee..e1e1def5 100644
--- a/src/requesthandler/RequestHandler.h
+++ b/src/requesthandler/RequestHandler.h
@@ -19,7 +19,7 @@ with this program. If not, see
#pragma once
-#include