Updated the templates to the new variables