Hardcoded partitionKey + new format support