Updated InstrumentDOM and InstrumentSAX