Added options command line tool