Added tokens to scanner
Added tokens to scanner