Merge service into client