Index changes and improvements