Updated command args list structure