Added autoscan option