Added basic messaging and notification support