Change protected message
Add enumeration support