Added support for objects