Added server and client initialization