Updated how relationships are handle during feature updates;