added support for objects and units