Added plugin class and extension