Make more similar to cloud-basic