Adding some backwards compatibility to templates [13717790]