More service reworking