[discovery] modernize