Edited scan class to be up to date with newer architecture.