Struct & Enum support improved