Refactored parser package