Added plugin defaults with comments