Currently this is done after the indexing has been completed, thus the implementation doesn't cut down the computation time. related to #17