added messages support and No Data notification