Now all commands handle files