Move annotation process to sax