Modified parser class