Added optional Partition value for CustomData