Add s_server and s_client async support