Added address selection