Make nServices atomic