Working on discover method and handlers for unknown and waiting