Added additional parser states