Finish discovery by individual list. No paradigm change yet.