Migrate to Xstream to prevent too many changes. Still have memory issue, but some flexibility to still find away around it.