Added server and client classes