Make Class no longer implement Message directly
#155
Merged
Class no longer implement Message directly
#155