Updated ArgumentMap to use StrongTypeMap and StringList