Service provider tweak