More template additions