Modified: Update cli. Support of options for Thor.