Added MsgId handling