Updates, add scanner class