Update entity relationships and identity