Add plugins and fix