Moved the xml conversion stuff to its own service instead of being on the entity