Adding support for nested JSON objects