Added a new parser class