Added augment and modified lexer.