use FieldType enum values instead of constants
Merge remote-tracking branch 'origin/master'
Refactor for using MessageType