Improve ARIA support