Change in the code generation of fixes, to generate through templates