Adding support for new style Cloud App