Fixed remaining 'service' class