Optimized xml locations

No duplicate xmls any more