major changes in xml_handler2.hpp