Added address lookup