Changes on the Messaging Module