Add new feature to disable tracking