Offers indexation refactoring