Different indexes improvements