Fixes #822 - Move higher level Index related ops.