Handle the larger amount of arguments allowed now