more optimization on sax adapter