Changed creation of defaults dictionary according to cloud type.