Same as in service.py