Added plugin support classes