Update for codegen changes