Switched to a more efficient index format