Overhauled the Parsing Engine