first version of argument map added