Add plugins from @bmuschko