UPDATE: Allow better support for objects you don't control