Add more health checks