Updates for cutom PartitionKey