Added new autoscan feature