Changed Message class