Added context for selectors