Updated Healthcheck code