Adding address lookups