Make more possibility for cli