Health Checker improved