ServiceModel changes