Added AutoScanHandlers option