Some LookupManager refactoring