A few more changes to use the Message class in more places where it
would make sense