Revamp parser