Some template changes