Added some plugins
fixed conflict