Flow neighbor address refactor