Update argument list

The argument list is taken from v1.1-2-g2c0814e