Add ability to disable autotracking