Message enum changes

Message enum can be it's own class