Adding argument number checking