Support singleton json objects and add Id mapping to records