DBAAS support changes