Added accessibility changes