Added client and server