Add optional clustering to ProductModel serialization