Adding cloud model
Merge fix