Added typedefs for nested structs and enums