Refactor address_row fields