Changed to one scanner per module