added celery handling