[INTERNAL] Continue work on generalized Index