updated xml generator