Index improvements