Lot of index service refactoring

Signed-off-by: Seemant Rajvanshi <seemant.rajvanshi@gmail.com>