Added support for cloud hosts