Added scanner code to handle indentifiers