Add InputOption and fix CS