Removal of EntityIndex and EventIndex classes and using mango equivalents with the same name