Updated for changes to DBaaS and DNS APIs