Add scanner support