ServiceServer partial

ServiceServer partial update