Added some missing template tags