Removed reliance on index-based search