Added support for more dispatch
Fixed arg list ordering issue