Added support for disable selectors