added extra field in tokenizer / event Handler