Added Message class support Refactoring 1
Fixed missing message operations