Added $argv support