Added Modularity in the cloud talk