Refactored health-check support.
Refactored health-check support.