added messages support