updated code generation templates