Add more messaging support