Finish the relationship refactoring to the FileBasedIdentityStore.