Added more ARIA roles