Dramatically improve parser / Data option optimized - 15 times faster