moved address table entries to a separate function