Added address table scheme