Before editing index
Refactoring collection module
Refactoring collection module