We need to be backwards compatible. So 'm fine with having a cloud section with more options, but we also need to provide the aws one. We can deprecate it and remove it in the future.