Updated ServiceType refs in Cloud Databases