Updated missing template variables