JS-264 Modify Indexing for low memory devices