Migrate to new addresses