Rework accessibility p13n to be more generalized