Refactored CObjectManager to std::map