Changed the name of message-id -> msg_id