Add scanning speedups