added the address(es) lookup logic