Updated "simple" scanner management