Speed up tokenizer and parser
Increase parser perfomance
Update dependencies