added cloud support