refactoring - type parameter added to NodeSelector