Overhaul the service request classes