Touch up Reader classes in Index