Added address generator