Latest Lucene updates and refactor.