Enhance host checking