Add client, server, service