Added handling for objects, arrays and strings