Main address entry refactor complete