Move arguments to CLI