add support for more selectors