Integration

Current integrated changes
rename to MessageType