Make discovery callback more strict