Add support for jsobjects and arrays