Core/EventMap: More improvements and doxygen doc