Refactor reference management to reflect that relationships are being resolved