Code Updated for message and enumeration removed

Code Updated for message and enumeration removed