Added support for WAI-ARIA