Moved to dicts instead of an array of arrays in addArgs