Add support for data-selector attribute