Reworked index updating strategies