Add address decoding