Add struct-style generator
Update generated files