Refactor to use new Address tables