Added support for nargs in other places