Moved to separate args array for commands