Minor re-arranging of service provider class