Tweak the Service classes