Alessio's NodeSelector renamed
Flexible NodeSelectorFactory #18