Added server & client classes