Switched to XML serialization for storage