Parser re-implementation