Get rid of suffix based parsing