Flexible discovery