Make work with latest codegen changes