Moving stuff to xml generator parameters