Fixing bugs caused by merge requests.

Now fully supports objects of arrays and strings