Added uncommented extra options.