Improve Celery implementation