Arnaud: Refactored client/server communications