Update to do with new Type Enum
Merge remote-tracking branch 'origin/master'