Changes to support improved related object manipulations