Restored original Indexes API