Discovery now happens in same thread