Changed Message tag into an enumeration