Add more stuff to scanner
Rename scanner