Further updates to Message classes.