More work on new index event model