Added support for selectors