Xml config handler updated