BROKEN - Refactoring for lazy evolution index updates