Improve addresses association