Update for changed SelectorBuilder