Modified some classes of the plug-in