Rework the extra services code