Add support SAPI cli-server