Improved CloudContainer and Clouds