Changed api of neighbours iterator