CLI API will be converted to REST API