Added annotations for messages

Refs #838