Added messaging and search functionality