[DEV] cmake file update and start update to std::map