Improve profile address management