Added ARGV functionality