Generalized the msg format slightly