client_base some improvements