New changes to make health_check_timeout a DB column