Adapt Client / Server communication