Update to latest codegen
Can reference generator by key again
Update codegen