New agument added to parser, some changes in index_generator