Datafields are now returned no matter how deep in hierarchy