Adding logic to better manage remote related content