Adding an abstract class to have a central xml generation function
+ Some minor corrections