updated parser class