Improved the cloud server detection