Adding better cli options.