Update class for AddIndexEntry
Add handler for AddIndexEntry
remove old comment