Enhance address management