added 'extra-args' CLI handling