Class refactorings for address map component.