Add support for managed cloud