added support for messages on controller