Added scanner class