Upcoming changes for Address Management