Feature/index cli improvement