Modification for the new Sax Parser