Neighbor discovery has been extracted to its own component as well