Refactored index format