Feature/indexing tokenization