Adjusted codetemplates.xml