adding support for messages
adding support for messages