Align client with server