Refactored object selectors.