Improve core address selection