Updated parser
Added performance tests