adding messaging support