Added ARGV handling