Update Command docblock
Rewrite global options