Refactored scanner delegates into map