Refactoring addresses into separate table.