added messaging support