Added basic scanning