Add new variables into email template and remove Request object