Add support for objects, arrays, functions