Add struct and union