Switching from raw values to objects.
Add objects and arrays.