Improve names and calls
Add Scan