More template modifications