Add support for all selector types