Added missing template changes from last commit