Added full message parser/generator