Added indexed key to anticipate PartitionGraph. Needs testing!