Add address extraction