Add XData multi value support