Refactored parsing engine.
Refactored parsing engine.