Updated word indexing