Update with all new selectors