updated messaging support for further message-based tooling