Made PartitionId more explicite