Updated Client/Server/MainActivity classes