Adding Client and Server for local and remote services