Implement faster indexing