HHH-8088 - Redesign Scanner contract