Small improvement to DataDocument generation to use a single Map for one and one-nofk relationships and a List of Maps otherwise (instead of always a List of Maps)