Changed back to old `Parser` type