Added smarter argument handling