Updated with new plugins / options.