Client and server added