Added Client/Server classes