Timeout for commands and be more restrictive on redirection
Remove separate arguments field