add support for messages