Add polling for id detection