Rename Content -> RawContent; store RawMessage
Start testing comment