added more struct to codegen