Updated future CLI plans