Add more checks
Add http support