Modify xml-s to support only verison 6.2.5 and above
Change deprecated methods