Better xml format

Add attributs and other childs