Rework initial API of new keyword lists manager class, part 2