Corrected template variables