Some more plugins and changes