Now building Server and Client is more coherent