Added plugin and changes