Added messaging and notifications