Added Enum and DateTime types