Uses updated codegen