Updated order on template variables