Some changes in IndexCreator and SimilarityCalculator