Improve scanning