updated includes and Message Type