Changed XML construction to new library, all conversion done by external class