Scan performance tuned