Added plugin loop support