More code generation work