Added some custom code for Message
Fixed some metadata