Refactored data with indexes