Add plugins and fix bugs