Domain objects linking reorganization