#1 changes to support better handling of nested json.