Update to do with new Type Enum