Added Indexing for faster processing