Modified Service provider structure