Added server and client