New templates added. Reviewing each FillTemplate method