[ClearCloud] Update for Data-Serving