Change structure. Add cleaner; Indexes