Messaging changes implemented