This is what the new services.py code uses