Refactoring - introduced ParseContext