Adding more plugins and fixing bugs