Added support for objects.