Added plugin handling