Minor modifications and add some plugins