Work more on cloud api