Add cloud storage and misc
Update
Cleanup