Added plugin & comments