Added support for object selectors