Update in Grammar and Scanner