Updated Messaging Functionality