Added template changes