Updating client_std for portability