Changes to ContactManagerImpl