Extend command-line flexibility