Reworked discovery handler: is now an actor