Add non-analytic track option