added support for general messaging