refs #2703: Update XML generation, remove some hardcoding
Merge pull request #126 from razvan-tache/task_2703

refs #2703: Update XML generation, remove some hardcoding