Add m_msg
Exclude Search in extra class