added support for objects and changed the description