Updates to scanner_helper