more detailed models, improved celery