Heuristics files added. Fix non-xml files