Add separate text and xml handlers