Add DEFS to structs