Added a few new options.