Change unions to structs