Added options to cmdline tool