Improved server/client communication