Improvement to Json and Xml!