Added Integer & Enum types