More template changes