Started SaxHandler rewrite