Extended the log and updated the lexer