Move back to use selectors instead of strings