Added more accessibility features