Added more support for data attributes.