Change type for Message, now using Enumeration