JAL-629 Added 'Type' to args and argvalues