Added parser class