Celery improvements