Refacting. Adding Xml sample stuff.