Added couple of classes for index management