Add support for Object/Array.