Renamed and updated parser class