Added a check for data attributes in addition to classes. Fielder's choice