Message Class/Monitor Class updates