Added celery support