MessageType commented and Info modifications