Add Struct and Enum