Added temporary provision for other cloud providers