Added support for objects and nulls