Stage 2 of address handling