Added Enum and Lookup types.