Enhance plugin class