Added more Lucene structures for adding to index and performing query