Added support for basic messaging