Scanner improvements