Adding Client and server