added address lookup logic (beta)