Refactory xml traveler
Fixed bugs