Added address encoding.