Relationship refactoring to the FileBasedIdentityStore