Add identity manager changes from the refactoring branch.