Updated CodeTemplates(I seem to have mised those)