Refactored recursive parser and added non-recursive parser