Added scanner and parser